From 92f21a95f6ff756723c8100ab3bd4544063028f8 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 24 Jul 2013 21:50:43 +0000
Subject: [PATCH] GPSBabel.pro Windows fixes from Gerhard.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4475 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/GPSBabel.pro          |  2 +-
 gpsbabel/msvc/GPSBabel.vcxproj | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gpsbabel/GPSBabel.pro b/gpsbabel/GPSBabel.pro
index dc3f5abdb..1d386aaaa 100644
--- a/gpsbabel/GPSBabel.pro
+++ b/gpsbabel/GPSBabel.pro
@@ -70,7 +70,7 @@ macx|linux {
 
 win32 {
   DEFINES += __WIN32__ _CONSOLE
-  DEFINES -= -UNICODE -ZLIB_INHIBITED
+  DEFINES -= UNICODE ZLIB_INHIBITED
   DEFINES += HAVE_LIBEXPAT
   CONFIG(debug, debug|release) {
     DEFINES += _DEBUG
diff --git a/gpsbabel/msvc/GPSBabel.vcxproj b/gpsbabel/msvc/GPSBabel.vcxproj
index 0be8eb349..f5340a637 100644
--- a/gpsbabel/msvc/GPSBabel.vcxproj
+++ b/gpsbabel/msvc/GPSBabel.vcxproj
@@ -16,7 +16,6 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -32,7 +31,6 @@
     <IncludePath>C:\Qt\5.1.0\msvc2012\include;$(IncludePath)</IncludePath>
     <OutDir>.\$(Configuration)\</OutDir>
     <IntDir>.\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Midl>
@@ -40,7 +38,8 @@
       <HeaderFileName />
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>expat;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <WarningLevel>Level3</WarningLevel>
       <TreatWarningAsError>false</TreatWarningAsError>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -58,12 +57,14 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>setupapi.lib;hid.lib;qt5core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>setupapi.lib;hid.lib;qt5cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <OutputFile>.\$(Configuration)/GPSBabel.exe</OutputFile>
       <ProgramDatabaseFile>.\$(Configuration)/GPSBabel.pdb</ProgramDatabaseFile>
@@ -73,9 +74,8 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BrowseInformation>true</BrowseInformation>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -88,7 +88,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-- 
2.30.2